Adwaita: osd rationalization and tweakings

Removed bright translucent outer border for "top level" osd widgets,
insensitive osd entry styled, more meaningfull color variables and
some code rationalization.

diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index 59c50e0a78737a6eda0f443a0a2abc617fba111d..40c6358a74dc68bd0c5c7cf1b305285e37ce1b5f 100644 (file)
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -23,15 +23,14 @@ $destructive_color: if($variant == 'light', #ef2929, darken(#ef2929,10%));
 
 $osd_fg_color: #eeeeec;
 $osd_text_color: white;
-$osd_bg_color: #2e3436;
-$osd_insensitive_bg_color: mix($osd_fg_color, $osd_bg_color, 10%);
-$osd_insensitive_fg_color: mix($osd_fg_color, $osd_bg_color, 50%);
+$osd_bg_color: transparentize(#2e3436, 0.3);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.9);
 
 $sidebar_bg_color: lighten($bg_color,5%);
 
-$tooltip_borders_color: $osd_outer_borders_color;
+$tooltip_borders_color: transparentize(white, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 498111389e4842230450275bb908b6975d15a7ac..bc4b41f5d5b525d39c45feb13e7f55af7e96b933 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -202,8 +202,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
 
 %osd, .osd {
   color: $osd_fg_color;
-  border-color: $osd_outer_borders_color;
-  background-color: transparentize($osd_bg_color, 0.3);
+  border: none;
+  background-color: $osd_bg_color;
   background-clip: padding-box;
   outline-color: transparentize($osd_fg_color, 0.7);
   box-shadow: none;
@@ -408,6 +408,7 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     @include entry(osd);
     &:focus { @include entry(osd-focus); }
     &:backdrop { @include entry(osd-backdrop); }
+    &:insensitive { @include entry(osd-insensitive); }
   }
 }
 
@@ -493,27 +494,27 @@ $_dot_color: if($variant=='light', $selected_bg_color,
     &.image-button { padding: 13px; }
     color: $osd_fg_color;
     border-radius: 6px;
-    outline-color: transparentize($osd_fg_color, 0.8);
+    outline-color: transparentize($osd_fg_color, 0.7);  //FIXME: define a color var?
     @include button(osd);
-    border-color: $osd_outer_borders_color;
+    border: none;
     box-shadow: none;
     &:hover {
       @include button(osd-hover);
-      border-color: $osd_outer_borders_color;
+      border: none;
       box-shadow: none;
     }
     &:active, &:checked {
       @include button(osd-active);
-      border-color: $osd_outer_borders_color;
+      border: none;
       box-shadow: none;
     }
     &:insensitive, &:backdrop:insensitive {
       @include button(osd-insensitive);
-      border-color: $osd_outer_borders_color;
+      border: none;
     }
     &:backdrop {
       @include button(osd-backdrop);
-      border-color: $osd_outer_borders_color;
+      border: none;
     }
   }
   //overlay / OSD style
@@ -946,7 +947,7 @@ GtkColorButton.button {
       &:hover {
         @include button(undecorated);
         color: $osd_fg_color;
-        border-color: transparentize($osd_borders_color, 0.3);
+        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
         background-color: transparentize($osd_fg_color, 0.9);
         icon-shadow: 0 1px black;
         box-shadow: none;
@@ -954,14 +955,14 @@ GtkColorButton.button {
       &:backdrop {
         @include button(undecorated);
         color: $osd_fg_color;
-        border-color: transparentize($osd_borders_color, 0.3);
+        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
         icon-shadow: none;
         box-shadow: none;
       }
       &:insensitive {
         @include button(undecorated);
         color: $osd_insensitive_fg_color;
-        border-color: transparentize($osd_borders_color, 0.3);
+        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
         icon-shadow: none;
         box-shadow: none;
       }
@@ -1121,10 +1122,9 @@ GtkComboBox {
   background-color: $bg_color;
   .osd &, &.osd {
     padding: 13px;
-    border: $osd_outer_borders_color;
+    border: none;
     border-radius: 6px;
-    background-color: transparentize($osd_bg_color, 0.3);
-    background-clip: padding-box;
+    background-color: $osd_bg_color;
   }
 }
 
@@ -2154,7 +2154,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     //OSD sliders
     .osd & {
       @include button(osd);
-      background-color: $osd_bg_color;
+      background-color: opacify($osd_bg_color, 1);
       &:hover { @include button(osd-hover); }
       &:active { @include button(osd-active); }
       &:backdrop { @include button(osd-backdrop); }
@@ -2554,19 +2554,14 @@ GtkScrolledWindow {
 .app-notification.frame {
   @extend %osd;
   padding: 10px;
-  border-width: 0 1px 1px;
-  border-style: solid;
-  border-color: $osd_outer_borders_color;
+  border: none;
   border-radius: 0 0 6px 6px;
-  background-color: transparentize($osd_bg_color, 0.3);
+  background-color: $osd_bg_color;
   background-image: linear-gradient(to bottom, transparentize(black, 0.8),
                                                transparent 2px);
   background-clip: padding-box;
   &:backdrop { background-image: none; }
   .button {
-    border: 1px solid;
-    color: $osd_fg_color;
-    outline-color: transparentize($osd_fg_color, 0.8);
     @include button(osd);
     &.flat {
       @extend %undecorated_button;
@@ -2577,10 +2572,14 @@ GtkScrolledWindow {
       &:backdrop:insensitive { @extend %undecorated_button; }
     }
     &:hover { @include button(osd-hover); }
-    &:active, &:checked, &:backdrop:active, &:backdrop:checked {
+    &:active,
+    &:checked,
+    &:backdrop:active,
+    &:backdrop:checked {
       @include button(osd-active);
     }
-    &:insensitive, &:backdrop:insensitive {
+    &:insensitive,
+    &:backdrop:insensitive {
       @include button(osd-insensitive);
     }
     &:backdrop { @include button(osd-backdrop); }

diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index 89ad568667a696da69c6011c37258f26e8aa8f09..68be75ee4501fd4820116f35203f9a6d6d2b2b65 100644 (file)
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -95,7 +95,8 @@
   @if $t==osd {
     color: $osd_text_color;
     border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, transparentize(black, 0.5));
+    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
@@ -103,15 +104,26 @@
   @if $t==osd-focus {
     color: $osd_text_color;
     border-color: $selected_bg_color;
-    background-image: linear-gradient(to bottom, transparentize(black, 0.5));
+    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
+    background-clip: padding-box;
     box-shadow: entry_focus_glow($selected_bg_color);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
   }
+  @if $t==osd-insensitive {
+    color: $osd_insensitive_fg_color;
+    border-color: $osd_borders_color;
+    background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+  }
   @if $t==osd-backdrop {
     color: $osd_text_color;
     border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, transparentize(black, 0.5));
+    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
@@ -343,32 +355,32 @@
   // normal osd button
   //
     $_bg: if($c!=$bg_color, transparentize($c, 0.5),
-                            transparentize($osd_bg_color, 0.3));
+                            $osd_bg_color);
 
     color: $osd_fg_color;
-    outline-color: transparentize($osd_fg_color, 0.8);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, $_bg);
     border-color: $osd_borders_color;
+    background-image: linear-gradient(to bottom, $_bg);
+    background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
+    outline-color: transparentize($osd_fg_color, 0.7);
   }
   @else if $t==osd-hover {
   //
   // active osd button
   //
     $_bg: if($c!=$bg_color, transparentize($c, 0.3),
-                            transparentize(lighten($osd_bg_color, 12%), 0.3));
+                            lighten($osd_bg_color, 12%));
 
     color: white;
     border-color: $osd_borders_color;
     background-image: linear-gradient(to bottom, $_bg);
+    background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-
+    outline-color: transparentize($osd_fg_color, 0.7);
   }
   @else if $t==osd-active {
   //
@@ -379,19 +391,20 @@
     color: white;
     border-color: $osd_borders_color;
     background-image: linear-gradient(to bottom, $_bg);
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
+    outline-color: transparentize($osd_fg_color, 0.7);
   }
   @else if $t==osd-insensitive {
   //
   // insensitive osd button
   //
-    $_bg: transparentize($osd_insensitive_bg_color,0.5);
-
     color: $osd_insensitive_fg_color;
     border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, $_bg);
+    background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
@@ -401,11 +414,12 @@
   // backdrop osd button
   //
     $_bg: if($c!=$bg_color, transparentize($c, 0.5),
-                            transparentize($osd_bg_color, 0.3));
+                            $osd_bg_color);
 
     color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-image: linear-gradient(to bottom, $_bg);
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
@@ -418,7 +432,7 @@
     background-color: transparent;
     background-image: none;
 
-    @include _shadows(inset 0 1px transparentize(white,1),
+    @include _shadows(inset 0 1px transparentize(white, 1),
                       $_blank_edge);
 
     text-shadow: none;

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 543fa3438a443d9bbcae3ba5c22dbbe214739b1c..d59f2b085d908f7213175618ebea58b44e0f4d7a 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -135,7 +135,7 @@ GtkTextView {
 .popover.osd, .app-notification,
 .app-notification.frame, .osd {
   color: #eeeeec;
-  border-color: rgba(255, 255, 255, 0.1);
+  border: none;
   background-color: rgba(46, 52, 54, 0.7);
   background-clip: padding-box;
   outline-color: rgba(238, 238, 236, 0.3);
@@ -388,6 +388,7 @@ GtkTextView {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -397,6 +398,7 @@ GtkTextView {
       color: white;
       border-color: #215d9c;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
       box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0.7);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
@@ -406,6 +408,17 @@ GtkTextView {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .osd .entry:insensitive {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      color: #8e9191;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -560,17 +573,16 @@ GtkCalendar.header .button.titlebutton {
   GtkCalendar.header .osd.button.titlebutton {
     color: #eeeeec;
     border-radius: 6px;
-    outline-color: rgba(238, 238, 236, 0.2);
+    outline-color: rgba(238, 238, 236, 0.3);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+    background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    border-color: rgba(255, 255, 255, 0.1);
+    outline-color: rgba(238, 238, 236, 0.3);
+    border: none;
     box-shadow: none; }
     .button.osd.image-button, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button,
@@ -580,50 +592,55 @@ GtkCalendar.header .button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:active, .button.osd:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
       color: #8e9191;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
     .button.osd:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
   .osd .button, .osd .header-bar .button.titlebutton, .header-bar .osd .button.titlebutton,
   .osd .titlebar .button.titlebutton,
   .titlebar .osd .button.titlebutton,
   .osd GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .osd .button.titlebutton {
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+    background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3);
     border-radius: 0;
     border-left-style: none; }
     .osd .button:dir(rtl) {
@@ -644,20 +661,25 @@ GtkCalendar.header .button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
       color: #8e9191;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -665,6 +687,7 @@ GtkCalendar.header .button.titlebutton {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -690,9 +713,11 @@ GtkCalendar.header .button.titlebutton {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3);
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
@@ -704,6 +729,7 @@ GtkCalendar.header .button.titlebutton {
         color: #8e9191;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none;
@@ -733,9 +759,11 @@ GtkCalendar.header .button.titlebutton {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3);
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
@@ -853,32 +881,36 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.suggested-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #215d9c);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
         color: #8e9191;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -886,6 +918,7 @@ GtkCalendar.header .button.titlebutton {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -1003,32 +1036,36 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.destructive-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #d51010);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
         color: #8e9191;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -1036,6 +1073,7 @@ GtkCalendar.header .button.titlebutton {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -1530,7 +1568,7 @@ GtkCalendar.header .button.titlebutton:visited {
       text-shadow: none;
       icon-shadow: none;
       color: #eeeeec;
-      border-color: rgba(0, 0, 0, 0.4);
+      border-color: rgba(0, 0, 0, 0.5);
       background-color: rgba(238, 238, 236, 0.1);
       icon-shadow: 0 1px black;
       box-shadow: none; }
@@ -1542,7 +1580,7 @@ GtkCalendar.header .button.titlebutton:visited {
       text-shadow: none;
       icon-shadow: none;
       color: #eeeeec;
-      border-color: rgba(0, 0, 0, 0.4);
+      border-color: rgba(0, 0, 0, 0.5);
       icon-shadow: none;
       box-shadow: none; }
     .osd .spinbutton .button:insensitive {
@@ -1553,7 +1591,7 @@ GtkCalendar.header .button.titlebutton:visited {
       text-shadow: none;
       icon-shadow: none;
       color: #8e9191;
-      border-color: rgba(0, 0, 0, 0.4);
+      border-color: rgba(0, 0, 0, 0.5);
       icon-shadow: none;
       box-shadow: none; }
     .osd .spinbutton .button:last-child {
@@ -1705,10 +1743,9 @@ GtkComboBox {
   background-color: #393f3f; }
   .osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd, .osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
     padding: 13px;
-    border: rgba(255, 255, 255, 0.1);
+    border: none;
     border-radius: 6px;
-    background-color: rgba(46, 52, 54, 0.7);
-    background-clip: padding-box; }
+    background-color: rgba(46, 52, 54, 0.7); }
 
 .inline-toolbar {
   border-width: 0 1px 1px;
@@ -3166,14 +3203,13 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.slider, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
       border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3);
       background-color: #2e3436; }
       .osd .scale.slider:hover, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .osd
@@ -3181,24 +3217,29 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:active, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:backdrop, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -3834,9 +3875,7 @@ GtkCalendar.header list-row.button.titlebutton {
 .app-notification,
 .app-notification.frame {
   padding: 10px;
-  border-width: 0 1px 1px;
-  border-style: solid;
-  border-color: rgba(255, 255, 255, 0.1);
+  border: none;
   border-radius: 0 0 6px 6px;
   background-color: rgba(46, 52, 54, 0.7);
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
@@ -3850,18 +3889,14 @@ GtkCalendar.header list-row.button.titlebutton {
   .app-notification GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .app-notification .button.titlebutton,
   .app-notification.frame .button {
-    border: 1px solid;
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+    background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
@@ -3881,9 +3916,11 @@ GtkCalendar.header list-row.button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:active, .app-notification .button:checked, .app-notification .button:backdrop:active, .app-notification .button:backdrop:checked,
     .app-notification.frame .button:active,
     .app-notification.frame .button:checked,
@@ -3892,15 +3929,18 @@ GtkCalendar.header list-row.button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
       color: #8e9191;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -3909,6 +3949,7 @@ GtkCalendar.header list-row.button.titlebutton {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 6116c3759c3ef1a6410ad04a00dd9d86fe416ff5..3f9f10c04156a431db416fb74fe6da0550538329 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -135,7 +135,7 @@ GtkTextView {
 .popover.osd, .app-notification,
 .app-notification.frame, .osd {
   color: #eeeeec;
-  border-color: rgba(255, 255, 255, 0.1);
+  border: none;
   background-color: rgba(46, 52, 54, 0.7);
   background-clip: padding-box;
   outline-color: rgba(238, 238, 236, 0.3);
@@ -380,6 +380,7 @@ GtkTextView {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -389,6 +390,7 @@ GtkTextView {
       color: white;
       border-color: #4a90d9;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
       box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0.15);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black; }
@@ -398,6 +400,17 @@ GtkTextView {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .osd .entry:insensitive {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      color: #8e9191;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -552,17 +565,16 @@ GtkCalendar.header .button.titlebutton {
   GtkCalendar.header .osd.button.titlebutton {
     color: #eeeeec;
     border-radius: 6px;
-    outline-color: rgba(238, 238, 236, 0.2);
+    outline-color: rgba(238, 238, 236, 0.3);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+    background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    border-color: rgba(255, 255, 255, 0.1);
+    outline-color: rgba(238, 238, 236, 0.3);
+    border: none;
     box-shadow: none; }
     .button.osd.image-button, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button,
@@ -572,50 +584,55 @@ GtkCalendar.header .button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:active, .button.osd:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
       color: #8e9191;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
     .button.osd:backdrop {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
   .osd .button, .osd .header-bar .button.titlebutton, .header-bar .osd .button.titlebutton,
   .osd .titlebar .button.titlebutton,
   .titlebar .osd .button.titlebutton,
   .osd GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .osd .button.titlebutton {
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+    background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3);
     border-radius: 0;
     border-left-style: none; }
     .osd .button:dir(rtl) {
@@ -636,20 +653,25 @@ GtkCalendar.header .button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
       color: #8e9191;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -657,6 +679,7 @@ GtkCalendar.header .button.titlebutton {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -682,9 +705,11 @@ GtkCalendar.header .button.titlebutton {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3);
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
@@ -696,6 +721,7 @@ GtkCalendar.header .button.titlebutton {
         color: #8e9191;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none;
@@ -725,9 +751,11 @@ GtkCalendar.header .button.titlebutton {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3);
         background-clip: padding-box;
         border-color: transparent;
         box-shadow: none; }
@@ -845,32 +873,36 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.suggested-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #4a90d9);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
         color: #8e9191;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -878,6 +910,7 @@ GtkCalendar.header .button.titlebutton {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -995,32 +1028,36 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.destructive-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #ef2929);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
         color: #8e9191;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -1028,6 +1065,7 @@ GtkCalendar.header .button.titlebutton {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -1522,7 +1560,7 @@ GtkCalendar.header .button.titlebutton:visited {
       text-shadow: none;
       icon-shadow: none;
       color: #eeeeec;
-      border-color: rgba(0, 0, 0, 0.4);
+      border-color: rgba(0, 0, 0, 0.5);
       background-color: rgba(238, 238, 236, 0.1);
       icon-shadow: 0 1px black;
       box-shadow: none; }
@@ -1534,7 +1572,7 @@ GtkCalendar.header .button.titlebutton:visited {
       text-shadow: none;
       icon-shadow: none;
       color: #eeeeec;
-      border-color: rgba(0, 0, 0, 0.4);
+      border-color: rgba(0, 0, 0, 0.5);
       icon-shadow: none;
       box-shadow: none; }
     .osd .spinbutton .button:insensitive {
@@ -1545,7 +1583,7 @@ GtkCalendar.header .button.titlebutton:visited {
       text-shadow: none;
       icon-shadow: none;
       color: #8e9191;
-      border-color: rgba(0, 0, 0, 0.4);
+      border-color: rgba(0, 0, 0, 0.5);
       icon-shadow: none;
       box-shadow: none; }
     .osd .spinbutton .button:last-child {
@@ -1697,10 +1735,9 @@ GtkComboBox {
   background-color: #ededed; }
   .osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd, .osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
     padding: 13px;
-    border: rgba(255, 255, 255, 0.1);
+    border: none;
     border-radius: 6px;
-    background-color: rgba(46, 52, 54, 0.7);
-    background-clip: padding-box; }
+    background-color: rgba(46, 52, 54, 0.7); }
 
 .inline-toolbar {
   border-width: 0 1px 1px;
@@ -3319,14 +3356,13 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.slider, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
       border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3);
       background-color: #2e3436; }
       .osd .scale.slider:hover, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .osd
@@ -3334,24 +3370,29 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+        background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:active, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:backdrop, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
         color: #eeeeec;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
@@ -3995,9 +4036,7 @@ GtkCalendar.header list-row.button.titlebutton {
 .app-notification,
 .app-notification.frame {
   padding: 10px;
-  border-width: 0 1px 1px;
-  border-style: solid;
-  border-color: rgba(255, 255, 255, 0.1);
+  border: none;
   border-radius: 0 0 6px 6px;
   background-color: rgba(46, 52, 54, 0.7);
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
@@ -4011,18 +4050,14 @@ GtkCalendar.header list-row.button.titlebutton {
   .app-notification GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .app-notification .button.titlebutton,
   .app-notification.frame .button {
-    border: 1px solid;
-    color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+    background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
@@ -4042,9 +4077,11 @@ GtkCalendar.header list-row.button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
+      background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:active, .app-notification .button:checked, .app-notification .button:backdrop:active, .app-notification .button:backdrop:checked,
     .app-notification.frame .button:active,
     .app-notification.frame .button:checked,
@@ -4053,15 +4090,18 @@ GtkCalendar.header list-row.button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
       color: #8e9191;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
@@ -4070,6 +4110,7 @@ GtkCalendar.header list-row.button.titlebutton {
       color: #eeeeec;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }